Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 17 May 2010 22:44:26 +0000 (22:44 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 17 May 2010 22:44:26 +0000 (22:44 +0000)
commit954f35ce081b8626d0797ab5f92e1c17136779d7
tree08b317fb009e9e803fddc0fd5116d26485cae87d
parentee2c2bf23d918034ec34f96dd516f7e87ae8df22
parentd009ed533872a4e3d56c6b5e348f5a996a50e3b7
Merge from mainline.